host-ctr: Unmask /sys/firmware from host containers
#2573
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yeazelm
reviewed
Nov 12, 2022
jpculp
force-pushed
the
unmask-sys-firmware
branch
from
1ba82aa
to
5255c77
Compare
|
Added the reference for masked paths into the code. |
webern
approved these changes
Nov 14, 2022
bcressey
approved these changes
Nov 14, 2022
| @@ -288,6 +288,20 @@ func runCtr(containerdSocket string, namespace string, containerID string, sourc | |||
| oci.WithHostNamespace(runtimespec.NetworkNamespace), | |||
| oci.WithHostHostsFile, | |||
| oci.WithHostResolvconf, | |||
| // Unmask `/sys/firmware` by passing an alternate list of masked paths | |||
| // List is based on the DefaultUnixSpec's MaskedPaths for Linux | |||
| // (https://github.com/containerd/containerd/blob/main/oci/spec.go) | |||
There was a problem hiding this comment.
nit: a permalink to the exact MaskedPaths list would be preferable, in case that list gets refactored out of the file
rpkelly
approved these changes
Nov 14, 2022
This provides extra insight into the hardware of the underlying Bottlerocket host, such as the number of CPU sockets on aarch64 variants.
jpculp
force-pushed
the
unmask-sys-firmware
branch
from
5255c77
to
f4c1899
Compare
|
Pinned the comment to the commit the masked paths were based on. |
bcressey
approved these changes
Nov 14, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes:
This provides extra insight into the hardware of the underlying Bottlerocket host, such as the number of CPU sockets on aarch64 variants.
NOTE: List of masked paths come's from containerd's
oci/spec.go.Testing done:
Built and launched an aarch64 k8s variant on a
c6g.largeand ranlscpufrom the control container.Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.